fix(status): recognize all unmerged modes when staging/discarding, not just UU#1980
Merged
CKolkey merged 1 commit intoJul 9, 2026
Merged
Conversation
…t just UU Staging (`s`) or discarding a conflicted file only routed to the conflict resolver when the file's status mode was exactly "UU" (both modified). Other unmerged modes were missed -- most notably "AA" (add/add, produced whenever two branches independently add the same path) and the modify/delete modes "UD"/"DU". For those, `s` fell through to the plain "stage this file" branch and staged the file with its conflict markers intact, so leftover `<<<<<<<`/`=======`/`>>>>>>>` markers could be committed unnoticed. Add a single `git.status.is_unmerged(mode)` helper covering the full set of unmerged porcelain codes (UU, AA, DU, UD, AU, UA, DD) and route every conflict-detection site through it: normal stage, visual-selection stage, discard hunk/section/file, the diffview conflicting/working split (which was also missing DD), and any_unmerged.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Staging (
s) or discarding a conflicted file only routed to the conflict resolver when the file's status mode was exactly "UU" (both modified). Other unmerged modes were missed -- most notably "AA" (add/add, produced whenever two branches independently add the same path) and the modify/delete modes "UD"/"DU". For those,sfell through to the plain "stage this file" branch and staged the file with its conflict markers intact, so leftover<<<<<<</=======/>>>>>>>markers could be committed unnoticed.Add a single
git.status.is_unmerged(mode)helper covering the full set of unmerged porcelain codes (UU, AA, DU, UD, AU, UA, DD) and route every conflict-detection site through it: normal stage, visual-selection stage, discard hunk/section/file, the diffview conflicting/working split (which was also missing DD), and any_unmerged.